flags support added