Added Classes; unified default values