moving default property handler to separate bundle, or there is probably something to do this for me