Made some changes to DrawableObject Based on Felix opinions