Added more filters
Allow access to body of class for adding methods etc