Resolved #35
Added missing classes