I agree with you - we need to extend it. On the meantime I would like to avoid hardcoded list :)