Added features to support camera photo