Fix directive requirement & nested controller support