Added initial special behaviour support