diff --git a/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt b/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt
index 45d0427a4910b17dba0d51cbbce91ebc67492940..db3f434b5fe07edbf82b715fc60b89d6134b9753 100644
--- a/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt
+++ b/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt
@@ -31,6 +31,17 @@ set( OTBApplicationEngine_SRC
   otbWrapperInputFilenameListParameter.cxx
   otbWrapperOutputImageParameter.cxx
   otbWrapperInputImageParameter.cxx
+  otbWrapperInputImageParameterUInt8.cxx
+  otbWrapperInputImageParameterUInt16.cxx
+  otbWrapperInputImageParameterUInt32.cxx
+  otbWrapperInputImageParameterInt16.cxx
+  otbWrapperInputImageParameterInt32.cxx
+  otbWrapperInputImageParameterCInt16.cxx
+  otbWrapperInputImageParameterCInt32.cxx
+  otbWrapperInputImageParameterCFloat.cxx
+  otbWrapperInputImageParameterCDouble.cxx
+  otbWrapperInputImageParameterFloat.cxx
+  otbWrapperInputImageParameterDouble.cxx
   otbWrapperParameterKey.cxx
   otbWrapperDocExampleStructure.cxx
   otbWrapperInputVectorDataParameter.cxx
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
index fe226ef2ffbd7ccb6f588e3926642181c31819ea..96b315b050c76e22a9dd89060777e1d4dede5363 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
@@ -70,18 +70,6 @@ InputImageParameter::GetImage()
 
 otbGetImageMacro(UInt8RGBImage);
 otbGetImageMacro(UInt8RGBAImage);
-otbGetImageAndVectorImageMacro(UInt8);
-otbGetImageAndVectorImageMacro(UInt16);
-otbGetImageAndVectorImageMacro(UInt32);
-otbGetImageAndVectorImageMacro(Int16);
-otbGetImageAndVectorImageMacro(Int32);
-otbGetImageAndVectorImageMacro(Float);
-otbGetImageAndVectorImageMacro(Double);
-otbGetImageAndVectorImageMacro(ComplexInt16);
-otbGetImageAndVectorImageMacro(ComplexInt32);
-otbGetImageAndVectorImageMacro(ComplexFloat);
-otbGetImageAndVectorImageMacro(ComplexDouble);
-
 
 void
 InputImageParameter::SetImage(FloatVectorImageType* image)
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCDouble.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCDouble.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..304a871a7757c1a3d7296319b058c48054bd9869
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCDouble.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(ComplexDouble);
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCFloat.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCFloat.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..264b851038d31309591fc0302450db99bbcd49d8
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCFloat.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(ComplexFloat);
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCInt16.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCInt16.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..d49f3d031a92ff29987d485298eb4aae41c84216
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCInt16.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(ComplexInt16);
+}
+}
\ No newline at end of file
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCInt32.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCInt32.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..5d675543ad21f25620b2ee410e6a31d70c98b8bc
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterCInt32.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(ComplexInt32);
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterDouble.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterDouble.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..b7735195eac6a82a3d9cfdf0726a7aaacd6169c9
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterDouble.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(Double);
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterFloat.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterFloat.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..9d41953f67861b5021752e86868ba9a7de3a375a
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterFloat.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(Float);
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterInt16.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterInt16.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..217fda3d3fcf00838937df23d0a8d70393555d33
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterInt16.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(Int16);
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterInt32.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterInt32.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..6a38bb1a303e90639ca24985d4f2f01795e1de04
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterInt32.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(Int32);
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterUInt16.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterUInt16.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..d2e58d1503439919714e15252ea8b7f608bf79a6
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterUInt16.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(UInt16);
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterUInt32.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterUInt32.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..fe75efce28305dd87fee383fa026084610d43497
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterUInt32.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(UInt32);
+}
+}
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterUInt8.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterUInt8.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..e8af7e127a3d2270dda6c6bb7ffd6ea60f825a04
--- /dev/null
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameterUInt8.cxx
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+ *
+ * This file is part of Orfeo Toolbox
+ *
+ *     https://www.orfeo-toolbox.org/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "otbWrapperInputImageParameter.h"
+#include "otbWrapperInputImageParameterMacros.h"
+#include "otbWrapperTypes.h"
+
+namespace otb
+{
+namespace Wrapper
+{
+otbGetImageAndVectorImageMacro(UInt8);
+}
+}