Added development mode and optimised support for API level 11