File modifications and added apc lib class