Added annotations for Doctrine and moved defaults to constructor