Added Static Object support, changed controls