Improved support for custom property specification and added better support for Json Input