Updated class layout