Issues #287 #297 #307 #308 Implemented