Added initial needle classes