[CLEANUP] Removed rogue code
[CLEANUP] Minore refactoring
[ENHANCEMENT] Added custom attribute crud supprt