Added more stuff for cube parsing