Added some code for entities and session beans