Refactured code > dyn property creation