Added some guidelines for oop