Make custom fields and properties as separate bundle & Refactoring code