Added support for markers and fixed a bug on controllers