Fixed routing, added S3Handler