Updated model to allow for easier rendering