Added condition check to mapper. Added todo to DAO