Added and developed custom classes