Move properties definition to constructor