Implemented additional factories