Adding conditions support and continuing development