Added base package classes