Removing $system var and extending Form from Service