Edit Base model for singleton use | Cleaned code a little more