Cleaned up and added new component bindable properties