A bit refactoring
Added complex enum
Slight change to test code enum