Added contracter and worker classes