Added new Subject class
Moved before_install higher