Added some aux classes