Applied class design revision #201311201611