Custom Map support added