Changed implementation to classes