Added a way to include optional methods