Added enums and more information to the component. refactored station util