Moved prop defintions to file