Adding setup for more essential classes