Added More Structure